From 941abf87804378aceba145cea658497b220c48f9 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 8 Oct 2008 21:00:56 +0000 Subject: [PATCH] =?utf8?q?Bug=20554702=20=E2=80=93=20gtkfilesystem=20leaks?= =?utf8?q?=20GError=20Also=20fixes=20some=20"format=20not=20a=20string=20l?= =?utf8?q?iteral=20and=20no=20format=20arguments"=20warnings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=21611 --- ChangeLog | 6 ++++++ gtk/gtkfilesystem.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 861d4396d4..816e389ee8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-10-08 Christian Persch + + Bug 554702 – gtkfilesystem leaks GError + + * gtk/gtkfilesystem.c (_gtk_file_system_init): Free the GError. + 2008-10-08 Matthias Clasen * gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb): diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 0bd79b08f6..2b2d44a3ba 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -323,7 +323,7 @@ save_bookmarks (GFile *bookmarks_file, NULL, FALSE, 0, NULL, NULL, &error)) { - g_critical (error->message); + g_critical ("%s", error->message); g_error_free (error); } @@ -531,7 +531,10 @@ _gtk_file_system_init (GtkFileSystem *file_system) G_FILE_MONITOR_NONE, NULL, &error); if (error) - g_warning (error->message); + { + g_warning ("%s", error->message); + g_error_free (error); + } else g_signal_connect (priv->bookmarks_monitor, "changed", G_CALLBACK (bookmarks_file_changed), file_system); @@ -1362,7 +1365,10 @@ gtk_folder_constructed (GObject *object) priv->directory_monitor = g_file_monitor_directory (priv->folder_file, G_FILE_MONITOR_NONE, NULL, &error); if (error) - g_warning (error->message); + { + g_warning ("%s", error->message); + g_error_free (error); + } else g_signal_connect (priv->directory_monitor, "changed", G_CALLBACK (directory_monitor_changed), object); -- 2.30.2